Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:54:07 +0000 (21:54 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:54:07 +0000 (21:54 +0800)

Trivial merge